From 814a54c22756b56663095e06839e8ed5fc87f27c Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Sun, 26 Apr 2026 16:18:32 +0200 Subject: [PATCH] disable-java-in-odk-build-examples-on-zero-vm Gbp-Pq: Name disable-java-in-odk-build-examples-on-zero-vm.diff --- config_host.mk.in | 1 + configure.ac | Bin 597656 -> 597965 bytes odk/Module_odk.mk | 4 ++++ 3 files changed, 5 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index 705404efe3d..22bca59f7d9 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -385,6 +385,7 @@ export JAVACFLAGS=@JAVACFLAGS@ export JAVAIFLAGS=@JAVAIFLAGS@ export JAVAIFLAGS_FOR_BUILD=@JAVAIFLAGS_FOR_BUILD@ export JAVAINTERPRETER=@JAVAINTERPRETER@ +export JAVA_HAS_ZERO_VM=@JAVA_HAS_ZERO_VM@ export JAVA_HOME=@JAVA_HOME@ export JAVA_HOME_FOR_BUILD=@JAVA_HOME_FOR_BUILD@ export JAVA_SOURCE_VER=@JAVA_SOURCE_VER@ diff --git a/configure.ac b/configure.ac index fab685ae4c0b26e9da9d0072516085ceec3b2eba..035740e2abfec0272528695bbf203e728a76597d 100644 GIT binary patch delta 220 zcmbQSSLN(}m4+6^7N!>F7M3lnOzhK}^qEDbfB3{CZ06+{=IH4c;u;hXT zi!<}m6-qKv6{1p$@)g2-V>P)HkU(ad!u0h&SrmEFi&6^|bPK`CrW@{I5fcKL7VqI0 z93SNxpzUdCBtP;}~ECE_C;J_|3J%ELYfBFJJc9F>q_Uzkr o*jd9Fr>|*X<`h6TWctNi){yqA9IQah2E^<@%(49{2j^i?0JG>s%K!iX delta 65 zcmX@RUuDK#m4+6^7N!>F7M3lnOzhK>zOX7!Zm?(H?#96y&NzLyJBRNyFILueE-nye Q17da{=Ge}~#d%m10Kp0pU;qFB diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 500348a7ea6..9029cb32b98 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -60,10 +60,14 @@ $(eval $(call gb_Module_add_check_targets,odk,\ ifneq ($(filter $(OS),LINUX MACOSX),) $(eval $(call gb_Module_add_subsequentcheck_targets,odk, \ CustomTarget_build-examples \ +)) +ifneq ($(JAVA_HAS_ZERO_VM),y) +$(eval $(call gb_Module_add_subsequentcheck_targets,odk, \ $(if $(ENABLE_JAVA),\ CustomTarget_build-examples_java \ ) \ )) endif +endif # vim: set noet sw=4 ts=4: -- 2.30.2